Results of semistructured (SM) and unstructured merge (UM) in revision : conflicts (C), conflicting lines of code (CL) and semantic conflicts (SC).
Yellow boxes indicate better results of unstructured merge. CM column dislays which kind is selected for combined conflict merge.
| C | CL | SC | CM |
---|
File | UM | SM | UM | SM | UM | SM |
---|
/PluginSDK/QuadTile.cs | 8 | 6 | 474 | 466 | -- | 0 | SM |
/WorldWind/Splash.cs | 2 | 1 | 36 | 34 | -- | 0 | SM |
/WorldWind/ScaleBarLegend.cs | 1 | 0 | 818 | 0 | -- | 0 | SM |
/WorldWind/TimeController.cs | 1 | 0 | 620 | 0 | -- | 0 | SM |
/PluginSDK/Renderable/Bar3D.cs | 1 | 0 | 552 | 0 | -- | 0 | SM |
/PluginSDK/Widgets/Scrollbar.cs | 1 | 0 | 402 | 0 | -- | 0 | SM |
/PluginSDK/TimeSetterDialog.cs | 1 | 0 | 165 | 0 | -- | 1 | SM |
/PluginSDK/Widgets/WidgetMenuButton.cs | 1 | 0 | 126 | 0 | -- | 0 | SM |
/PluginSDK/WidgetMenuButton.cs | 1 | 0 | 126 | 0 | -- | 0 | SM |
/PluginSDK/Units.cs | 1 | 0 | 22 | 0 | -- | 0 | SM |
/WorldWindow/WorldWindow.cs | 1 | 0 | 8 | 0 | -- | 0 | SM |
/PluginSDK/Renderable/WavingFlagLayer.cs | 1 | 1 | 961 | 179 | -- | 0 | SM |
/PluginSDK/TiledWFSPlacenameSet.cs | 1 | 1 | 947 | 103 | -- | 0 | SM |
/JhuaplWorldWind/jhuapl/util/JHU_Globals.cs | 1 | 1 | 560 | 244 | -- | 0 | SM |
/JhuaplWorldWind/jhuapl/util/JHU_ControlWidget.cs | 1 | 1 | 575 | 59 | -- | 0 | SM |
/JhuaplWorldWind/jhuapl/util/JHU_ButtonWidget.cs | 1 | 1 | 493 | 54 | -- | 0 | SM |
/PluginSDK/ModelFeature.cs | 1 | 1 | 407 | 48 | -- | 1 | SM |
/PluginSDK/ConfigurationLoader.cs | 1 | 1 | 209 | 198 | -- | 0 | SM |
/JhuaplWorldWind/jhuapl/util/JHU_CompassWidget.cs | 1 | 1 | 335 | 55 | -- | 0 | SM |
/WorldWind/KMLImporter.cs | 1 | 1 | 2 | 2 | -- | 0 | SM |
/PluginSDK/Renderable/GeoSpatialDownloadRequest.cs | 1 | 1 | 2 | 2 | -- | 0 | SM |
/PluginSDK/ImageStore.cs | 1 | 1 | 1 | 1 | -- | 0 | SM |
/JhuaplWorldWind/jhuapl/util/JHU_Log.cs | 0 | 0 | 0 | 0 | -- | 1 | UM |
/PluginSDK/Terrain/TerrainDownloadRequest.cs | 1 | 1 | 95 | 104 | -- | 0 | UM |
/Utilities/Log.cs | 1 | 2 | 50 | 8 | -- | 0 | UM |
/JhuaplWorldWind/jhuapl/util/JHU_Icons.cs | 1 | 2 | 558 | 194 | -- | 0 | UM |
/WorldWind/Compass3D.cs | 1 | 2 | 851 | 177 | -- | 0 | UM |
/WorldWind/WavingFlags.cs | 1 | 2 | 1017 | 225 | -- | 0 | UM |
/JhuaplWorldWind/jhuapl/util/JHU_ImageHelper.cs | 1 | 3 | 350 | 86 | -- | 0 | UM |
/WorldWind/WMSBrowserNG.cs | 1 | 3 | 680 | 431 | -- | 0 | UM |
/PluginSDK/World.cs | 1 | 3 | 1296 | 308 | -- | 0 | UM |
/JhuaplWorldWind/jhuapl/util/JHU_Icon.cs | 1 | 3 | 1416 | 346 | -- | 0 | UM |
/WorldWind/KMLDialog.cs | 1 | 4 | 206 | 123 | -- | 0 | UM |
/PluginSDK/QuadTileSet.cs | 6 | 8 | 312 | 224 | -- | 0 | UM |
/WorldWind/WorldWind.cs | 8 | 14 | 893 | 943 | -- | 0 | UM |